From: Jonas Dreßler Date: Fri, 9 Dec 2022 19:16:22 +0000 (+0100) Subject: Revert "appDisplay: Rename _lastOvershootTimeoutId" X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~405^2^2~191 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=52ed7917f3e030352cb7486b4d7e827aab2e8904;p=gnome-shell.git Revert "appDisplay: Rename _lastOvershootTimeoutId" This reverts commit 692de0eb952beabe1ef484dbf341516152378f54. Part-of: --- diff --git a/js/ui/appDisplay.js b/js/ui/appDisplay.js index 8e02e7f85..ae94a19b5 100644 --- a/js/ui/appDisplay.js +++ b/js/ui/appDisplay.js @@ -638,7 +638,7 @@ var BaseAppView = GObject.registerClass({ () => this._redisplay(), this); // Drag n' Drop - this._overshootTimeoutId = 0; + this._lastOvershootTimeoutId = 0; this._delayedMoveData = null; this._dragBeginId = 0; @@ -839,9 +839,9 @@ var BaseAppView = GObject.registerClass({ } _resetOvershoot() { - if (this._overshootTimeoutId) - GLib.source_remove(this._overshootTimeoutId); - this._overshootTimeoutId = 0; + if (this._lastOvershootTimeoutId) + GLib.source_remove(this._lastOvershootTimeoutId); + this._lastOvershootTimeoutId = 0; } _handleDragOvershoot(dragEvent) { @@ -857,7 +857,7 @@ var BaseAppView = GObject.registerClass({ return; } - if (this._overshootTimeoutId > 0) + if (this._lastOvershootTimeoutId > 0) return; let targetPage; @@ -869,14 +869,14 @@ var BaseAppView = GObject.registerClass({ if (targetPage < 0 || targetPage >= this._grid.nPages) return; // don't go beyond first/last page - this._overshootTimeoutId = + this._lastOvershootTimeoutId = GLib.timeout_add(GLib.PRIORITY_DEFAULT, OVERSHOOT_TIMEOUT, () => { this._resetOvershoot(); this.goToPage(targetPage); return GLib.SOURCE_REMOVE; }); - GLib.Source.set_name_by_id(this._overshootTimeoutId, - '[gnome-shell] this._overshootTimeoutId'); + GLib.Source.set_name_by_id(this._lastOvershootTimeoutId, + '[gnome-shell] this._lastOvershootTimeoutId'); } _onDragBegin() {